From: Paul Eggert <eggert@cs.ucla.edu>
Date: Mon, 20 Jun 2011 15:56:08 +0000 (-0700)
Subject: Merge from trunk.
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~324^2~2379^2~39
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=cc1f0170fd45078567c3da1f7e1727ac4f96770d;p=emacs.git

Merge from trunk.
---

cc1f0170fd45078567c3da1f7e1727ac4f96770d